From e2e46ad25b432e9eff6192001182d0c7633647a0 Mon Sep 17 00:00:00 2001 From: "unknown@aosda.research.intel-research.net" Date: Mon, 7 Nov 2005 18:25:09 +0100 Subject: [PATCH] Make xen0's default config match itself after a "make oldconfig" --- .../arch/xen/configs/xen0_defconfig_x86_32 | 8 +++----- .../arch/xen/configs/xen0_defconfig_x86_64 | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 index 5e6a2e8213..ef780d693a 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12-xen0 -# Wed Aug 3 09:54:56 2005 +# Linux kernel version: 2.6.12.6-xen0 +# Mon Nov 7 17:22:05 2005 # CONFIG_XEN=y CONFIG_ARCH_XEN=y @@ -151,11 +151,9 @@ CONFIG_X86_IO_APIC=y CONFIG_X86_UP_APIC=y CONFIG_X86_UP_IOAPIC=y CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GOMMCONFIG is not set # CONFIG_PCI_GODIRECT is not set CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y # CONFIG_PCIEPORTBUS is not set @@ -540,7 +538,7 @@ CONFIG_IP_NF_MATCH_IPRANGE=m # CONFIG_IP_NF_MATCH_STATE is not set # CONFIG_IP_NF_MATCH_CONNTRACK is not set # CONFIG_IP_NF_MATCH_OWNER is not set -CONFIG_IP_NF_MATCH_PHYSDEV=y +CONFIG_IP_NF_MATCH_PHYSDEV=m # CONFIG_IP_NF_MATCH_ADDRTYPE is not set # CONFIG_IP_NF_MATCH_REALM is not set # CONFIG_IP_NF_MATCH_SCTP is not set diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 index 1d5aea2b87..eea42fed6e 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12.4-xen0 -# Mon Aug 15 18:57:19 2005 +# Linux kernel version: 2.6.12.6-xen0 +# Mon Nov 7 17:24:18 2005 # CONFIG_XEN=y CONFIG_ARCH_XEN=y @@ -92,6 +92,7 @@ CONFIG_X86_GOOD_APIC=y # CONFIG_PREEMPT is not set CONFIG_MICROCODE=y # CONFIG_X86_CPUID is not set +CONFIG_SWIOTLB=y # CONFIG_NUMA is not set # CONFIG_MTRR is not set CONFIG_X86_LOCAL_APIC=y @@ -122,7 +123,6 @@ CONFIG_X86_XEN_GENAPIC=y # CONFIG_X86_MSR is not set # CONFIG_GART_IOMMU is not set CONFIG_DUMMY_IOMMU=y -CONFIG_SWIOTLB=y # CONFIG_X86_MCE is not set # @@ -480,7 +480,7 @@ CONFIG_IP_NF_MATCH_IPRANGE=m # CONFIG_IP_NF_MATCH_STATE is not set # CONFIG_IP_NF_MATCH_CONNTRACK is not set # CONFIG_IP_NF_MATCH_OWNER is not set -CONFIG_IP_NF_MATCH_PHYSDEV=y +CONFIG_IP_NF_MATCH_PHYSDEV=m # CONFIG_IP_NF_MATCH_ADDRTYPE is not set # CONFIG_IP_NF_MATCH_REALM is not set # CONFIG_IP_NF_MATCH_SCTP is not set -- 2.30.2